Merge "Remove dead code"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sun, 1 Sep 2013 22:27:12 +0000 (22:27 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sun, 1 Sep 2013 22:27:12 +0000 (22:27 +0000)

Trivial merge